fixed working now