Added basic conditions