test
test
merge fuckup
modifying some constants