Merged luke-jr code