second commit
removed some unwanted featuers