Added a lot of changes (Some methods)