[Improved] Do some clarification in Rubix