Trying to implement the APIs properly...