Add new code for more functions