Added status logic