speed improvements, TODO: bug in action sync