Initial changes
first iteration