Added new tickets from Maxim's suggestions