bug fixed
added functionality