Some stuff done and removed from here