Preparation 4.1.3 Pending Issues

Made different flags