started implementing saved states for faster usage