More functions implemented