More updates

Continuation of the previous commit