now no more null shit

Also now using Stas function