still fixing caps