Almost finished af6; Needs to be checked