[PM]: improvements