Removed RJCB stuff he has to fix first