Updated to little capass improvement