Some stuff added. :)