updated, so it works now