Few changes
New stuff