11.11.2013 Added & extended things