ready for merge with Alenas branch