refactored a bit
added policies