Optimize, add fixCap feature