Changed zastavka, added comments