Trying to improve kinda