modified some of the main features