working on final touches