Updated for actual users
Something to look at
Better naming
removed