finished major part of NEW safety