Two areas added, need to add valiation conditions to actions