Making it compatible with marathon