Updated Ben & Josh code