Added: cleaned up, propagated changes