updated it a bit