Added features to fix