Reviewed: Fixed logic statements add bookmark