Removed duplication, added new stuff