Moved more code

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