Needs vars changed to correct sizes