JP's bugs being fixed by me