removed dummy, fixed warnings