Collaboration with @sidnair changes