Some small tweeks to improve process