Better but this solution is definitely not good