made several changes to issue
tried to resolver merge off our issue stages, combined the code manually