added status class and more logic