Added a new transition setting and moved to API 21