Further improvements :)