Final changes. Removed jquery