More changes

Signed-off-by: NeWbY <paulthekiller+github@gmail.com>