Changed padding and stuff