Added some things like repeat and stuff