Fixed 1st two functions