Finaltesting

Tested on my machine and onyx, seems working fine!