Replaced short tags with normal tags (testing now)