moved some setting for clarity