Working but need some tweaks