Removed printing, changed ordering