added new simplified code for Linus