initial commit
changes
updated codes from lows
conflicts removed