tweaked a few stuff :)