My stuff
fixed merge