updated padding and stuff