Update

Changed some methods and added new files