formatting, and filling out interceptors
fixing merge conflict