Added status and bugfix