Return & Replace

#Return and replace should be updated here