simple dirty logic was added, but need some refactoring and styles