Finally working 100% totally properly