cleaned up crappy margin assignment