added support for amock