Fixes, reverted back to six caps