Added somo minor changes to works well