Lot's of important changes
issueId #7