added more magicy stuff