partially updated to 1.6.1