Reworked to allow 30 by 30