added,deleted, went a bit crazy, reverted back to a better place