Added some more indication stuff