up2s3 works! + some style improvements