updated pwmaker