Added indicator code and slight update to comments