Added not working Cluster Check!
Cleaned up a bit