Added ads in a non in-the-way method.

Removed some useless code as well

Signed-off-by: Exikle <dixondcunha@hotmail.com>