Some tweeks