More functions developed