Apr17_v0.4

Safety Commit