add and bugfix