#41 Removed redundant isShaking property