Work on stable code