Function declarations fixed