David/Shooter Rework agains