Updated to remove unneeded methods, fixed some methods to add pauses