Implementing new, better solution