Still working on it, better than before