fixing broken parts from previous commit