Fix #11 - #1 addition of Action and FPS