Modified version of v1.0.1. Changed indicators