Finished AP1 / New Functions