Switched to hardcoded functions