Rework promise usage
2.1.2