More necessary code to implement