updating code base with requests from sebastian