everything works but something should be proned away