halfway working, one little bug