Implemented comments from Ruben