added spme TODOs