Added security group
Cleaned up
Fixed bug