Mor eimprovements to the theme