even maor style changes
merge