Updated functionality but noy styling with this commit