initial changes
lots of changes