Removed warning issues temporarily. Might need better fix later on