Added more actions and implemented conditionals