fixing some abstraction issues