Remainder should be working now