Better time setting
Merge origin/master
Adding points to droptype