First form mostly works, second is now placed correctly