using dockerify and refactored