Final touches

Final touches for implementation