TO DO-s fixed