added comment
added add bug feature and helper methods