Changed views for security
Merging