MOAR LAMENESS FIXED