Add return change functionality