still solving bugs