customized some stuff - hopefully it works