working, but not properly and still without js