cleaned up stage2