Update basic clip logic