Added doorhandling