refactoring ; bumped to 0.5.3