Added status with failure / success indicator
Merged changes