Update V2

Fix Code and onpress + edit some stuff to proper methods