refactoring
more util methods
refactoring
added methods for workflow