lots of changes to cpanel part
couldnt test non-cpanel