Better cap functionality