Updated to really work with fresh OS