Added abbreviated functionality