Adding conditions code
This could change.