Apply more of #4
Apply more of #4
Fix #4