Latest changes

Fixed broken code.