portal bug fix
implemented rests