Adding activate/deactviate steps