cleaned up warnings so andrey doesnt cry anymore