Finishing the job pt2

@rare-modelness

Finishing the job pt2

amung