tried out some stuff, didnt work out
cherrypicked merge