removed caps stuff, since we probably want to implement it in another way