fixed everythinging except labels